* configure.in: Add support for the `--exec-prefix' option.

	* Makefile.in: Accept that support.

	* configure.in: Use the AC_PROG_INSTALL macro.
	* Makefile.in (INSTALL): Variable removed.
	(INSTALL_PROGRAM, INSTALL_DATA): Accept these values from configure.

diff --git a/Makefile.in b/Makefile.in
index 92dce17134390c8ca0c672d5a6b2144b2f505091..11ff13eef26fea05f73588dfa6be1b50a69330b4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -66,7 +66,7 @@ libsrc_libs=@libsrc_libs@
 prefix=@prefix@
 
 # Like `prefix', but used for architecture-specific files.
-exec_prefix=${prefix}
+exec_prefix=@exec_prefix@
 
 # Where to install Emacs and other binaries that people will want to
 # run directly (like etags).
@@ -183,9 +183,8 @@ buildlisppath=${srcdir}/lisp
 # ==================== Utility Programs for the Build ====================
 
 # Allow the user to specify the install program.
-INSTALL = install -c
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_DATA = ${INSTALL}
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 
 # ============================= Targets ==============================
 

diff --git a/configure1.in b/configure1.in
index f3bace3ed56c4b689e05ef4382ec8fb86a6dbc30..6809667e391b603da3c65b5caf4592bead47d0d3 100755 (executable)
--- a/configure1.in
+++ b/configure1.in
@@ -103,6 +103,7 @@ inst_paths=''
 
 ### Establish some default values.
 prefix='/usr/local'
+exec_prefix='${prefix}'
 
 while [ $# != 0 ]; do
   arg="$1"
@@ -240,6 +241,22 @@ Set it to either \`yes' or \`no'."
          prefix="${val}"
         ;;
 
+       ## Has the user specifiec an installation prefix?
+       "exec_prefix" )
+         ## If the value was omitted, get it from the next argument.
+         if [ "${valomitted}" = "yes" ]; then
+           ## Get the next argument from the argument list, if there is one.
+            if [ $# = 1 ]; then
+             (echo "${progname}: You must give a value for the \`--${optname}' option, as in
+    \`--${optname}=FOO'."
+              echo "${short_usage}") >&2
+             exit 1
+           fi
+           shift; val="$1"
+         fi
+         exec_prefix="${val}"
+        ;;
+
        ## Has the user asked for some help?
        "usage" | "help" )
          echo "${short_usage}" | more
@@ -835,6 +852,7 @@ fi
 dnl checks for programs
 AC_LN_S
 AC_PROG_CPP
+AC_PROG_INSTALL
 
 dnl checks for UNIX variants that set `DEFS'
 
@@ -1028,6 +1046,7 @@ AC_SUBST(LD_SWITCH_X_SITE)
 AC_SUBST(C_SWITCH_X_SITE)
 AC_SUBST(CFLAGS)
 AC_SUBST(prefix)
+AC_SUBST(exec_prefix)
 
 AC_DEFINE_UNQUOTED(config_machfile,  "\"${machfile}\"")
 AC_DEFINE_UNQUOTED(config_opsysfile, "\"${opsysfile}\"")